move the post-failsafe code from preinit to rcS, so that the serial console is access...

SVN-Revision: 5400

diff --git a/openwrt/package/base-files/default/etc/init.d/rcS b/openwrt/package/base-files/default/etc/init.d/rcS
index d93c81224c4c768bdd839ed22119eff2b1c20380..c887a19eb506ba6c8d8a059be30998c624ff2d9f 100755 (executable)
--- a/openwrt/package/base-files/default/etc/init.d/rcS
+++ b/openwrt/package/base-files/default/etc/init.d/rcS
@@ -1,9 +1,26 @@
 #!/bin/sh
-syslog_ip=$(nvram get log_ipaddr)
-eval $(ipcalc "$syslog_ip")
-[ "$syslog_ip" = "$IP" ] || syslog_ip=""
-syslogd -C 16 ${syslog_ip:+-L -R $syslog_ip}
-klogd
-for i in /etc/init.d/S*; do
-  $i start 2>&1
-done | logger -s -p 6 -t '' &
+(
+       lock -w /tmp/.failsafe
+       echo /sbin/hotplug > /proc/sys/kernel/hotplug
+       
+       ifconfig $ifname 0.0.0.0 down
+       
+       # revert to the boot loader's vlan config
+       # required for at least WRT54G v1.1
+       [ -d /proc/switch/eth0 ] && {
+               echo "$v0p" > /proc/switch/eth0/vlan/0/ports
+               echo "$v1p" > /proc/switch/eth0/vlan/1/ports
+               echo "$v2p" > /proc/switch/eth0/vlan/2/ports
+       }
+       
+       mount_root
+       
+       syslog_ip=$(nvram get log_ipaddr)
+       eval $(ipcalc "$syslog_ip")
+       [ "$syslog_ip" = "$IP" ] || syslog_ip=""
+       syslogd -C 16 ${syslog_ip:+-L -R $syslog_ip}
+       klogd
+       for i in /etc/init.d/S*; do
+         $i start 2>&1
+       done 
+) | logger -s -p 6 -t '' &

diff --git a/openwrt/package/base-files/default/etc/preinit b/openwrt/package/base-files/default/etc/preinit
index 716c9e668c9495de4e682ced097e7f99ef896f42..e8ac2d56edc42d211d3bceefea5f49bc03711c9d 100755 (executable)
--- a/openwrt/package/base-files/default/etc/preinit
+++ b/openwrt/package/base-files/default/etc/preinit
@@ -40,19 +40,4 @@ ifconfig $ifname 192.168.1.1 netmask 255.255.255.0 broadcast 192.168.1.255 up
 } || netmsg 192.168.1.255 "Press reset now, to enter Failsafe!"
 
 sleep 2
-lock -w /tmp/.failsafe
-echo /sbin/hotplug > /proc/sys/kernel/hotplug
-
-ifconfig $ifname 0.0.0.0 down
-
-# revert to the boot loader's vlan config
-# required for at least WRT54G v1.1
-[ -d /proc/switch/eth0 ] && {
-       echo "$v0p" > /proc/switch/eth0/vlan/0/ports
-       echo "$v1p" > /proc/switch/eth0/vlan/1/ports
-       echo "$v2p" > /proc/switch/eth0/vlan/2/ports
-}
-
-mount_root
-
 exec /sbin/init